Reorganising packages and changing from using direct variable access to getters and setter - had some bad practices for this coursework it seems, suprising how much you learn