reorganzing folders
continued work on locations