Reorganized project into a proper package