new file structure, updated readme as well