Some code cleanup. Moved stuff into seperate modules etc..
Some code cleanup. Moved stuff into seperate modules etc..
Deleted some unneccesary files