moved some code into new structure