Splitting main class, creating new packages, no more inner class BS