Refactoring / organisation

Signed-off-by: DziNeIT <dzineit@live.co.uk>