Refactoring

Added rest of missing attributes - not yet implemented
created new packages and classes moved between them