Removing twirl files
Import cleanup
Package refactoring
Stash
Changing static directory and some cleanup