restructure directories

Restructure directories
Merge pull request #2 from lvinsel/master

restructure directories