Changed packages names from plurals to singulars
Major refactoring to reduce side-effects (Still too much IMHO)