Adding and moving some files around
Compilation error fixes