Simplify repo structure