Moved package sources to src, minor fixes