Merge pull request #6 from wmantly/benny

getting rid of folders
naming functions