cleaned up dir layout, added template beginnings