Better modularization

1. So far I was simulatin the wrong file.
2. Because of the code clutter.