cleaned up repo/reorganized fs