Change directory structure

Issue #17