Updated the base file-structure to be standardized.