Made file structure more complete