Review source folder structure

Fix issue #8