Moved files to common package