moved some files for better visibility
added join event