More restructuring
Basic auth for API