Moved more source files to main folder