Add styles directory
fix merge problem
Clean up unused files