Restructure of all the files

BUILD DOES NOT WORK, DO NOT RECOMPILE