Added base structure, some classes