Moved files to package to make use easier