Restructured codebase, fixed pushState