moving code into standardized folder names
moving test packages
Merge pull request #1 from gregjan/master

moving code into standardized folder names