Changed the naming scheme and file structure to be more standard.