reorganized stuff and creating signals and slots