Fixed abstract/interface mixup
Move to new folder for modules