More package refactoring
Minor changes in the IDE part caused by restructuring in the core part