Moved modules

Created separate files for each module