Modified directory structure. Now package ready Closes #3