Cleaned project structure ready for dev