reorganized folders and removed redundant modules