Cleanup + added full project stuff