Code refactoring - Everything in appropriate packages