Redid project organization again (because I messed up last time)