Clean up repo and add class structure