Restructure code so i can remove home class