Cleaned up repo organization