Project directory clean up
Project directory clean up (more)