Moved source files into folders