Simulation fixes. Added top file to separate fileset (no part of the core/simulation model) and made some simulation optimizations