refactored file structure so it is not all junked up