Moved modules and created new ones, removed redundent tests