Restructured things a little bit; following new ideal project heirarchy.