Added friction and restructure folders a bit