Reverted back some code and moved files (Build Failing - WIP)