changed the folder structure to eliminate unnecessary folders