More reorganization, static files and api being served independently