Modified base module folder/files