Restructured Project Correctly