Moved source into sub-folder