Made proper package structure.