Rename listen to something more descriptive
Move files to sub folders
User the client listener
Log errors