Moved code inside one package