Added a proper package structure.