Refactoring location of some files into a different package structure
Refactoring location of some files into a different package structure
Reformatting
Adding source encoding