Improved project structre.