Flattened out the structure of the project