Redoing project structure