change directory structure
upgrade raven to 3.5.1
upgrade to haul 1.3.2
fix states