Moved files to appropriate package location