Project Cleanup & Added Packages