restructure for cleanlyness