refactor modules

waiting on entertainment