Merge pull request #53 from eprogramming/master

removing old structure.