Move to proper package structure.