Tidying up the Project/Layer code
Took an initial stab at switching up and down layers.