Refactoring

Initial submit for new rOCCI-Server structure