Organization of files into proper tree structure
Merge pull request #7 from cfangmeier/master

Organization of files into proper tree structure