update: Clean up directory structure, more updates.