Move abstract classes into their corresponding packages