Delete old files and start refactoring
Refactoring part 2: start declaration redundancy
Refactoring part 3: continue declaration redundancy
Refactoring part 4: continue continuing declaration redundancy
End of refactoring session