Restructuring folders
Update
Cleanup of styles