More work
Move source into subfolder