Moved package to src directory