Added more meaningful package names and separated classes accordingly