Moved source into subfolder