Spaces
Rename folder
Inline classes
Bundler
Minor refactoring