restructured code
Merge pull request #2 from AterCattus/restuct

restructured code