Renames, folder structure, next stop converting to preprocessors