changed to proper package structure