Moved all code to one package
Different packages don't give me any advantages, they only add difficulties