time to reorg cleanup a bit
more refactoring already, gets messy fast around here