Cleaned and updated project structure