First part of a brutal and massive refactoring...
for the next time you'll be pleased to know how java and git work, and obsiously you add to work proper