clean up file structure
widgets moved to separate file with full tests