Restructured folders

Fix #74