Moved everything except the main class to the main package