refactor folders and stuff