Moved main classes to main package