Merge pull request #181 from glynos/restructure_dirs

Restructure dirs