Tried to restructure files

Moved all the module files to lib, not really sure how modules work
right now. Will come back to this later