reworked listeners
moved module content to the right directory
get ready for take off