Removed oldSource folder and moved relevant files over to real project