Move files into project dir
Allow better project and file naming