Simplify repo structure for now