Single project directory and cleaner code

05/06/14