More restructuring, added more files from sample project