Reorganized the pakages. Added the tests. Changed some things