Finished new file hierachy