Updating directory structure to be more clear