added sub-modules, refined directory structure
removing unused files