Fixed folder layout and routing
Style changes and fixes