Clean and organize project