cleaned up repo structure