Change package name and add author
Change directory structure