Refactoring into new packages

Now using new directory structure (packages) - WIP.