Change company functionlity added
Some fixes
Moved registration files to the right place