Clean up and update dependencies
Fix directory structure