Moved package to own directory
Fixed package paths