Refactoring.
Fixed unit tests after renaming.
Fixed normalize.css not compiling with maven