Refactor package names
Remove some files from repository