Project directory cleanup #1
Project directory cleanup #2