restructured folders, major rehaul/cleanup