rearranged dependancies registration, did small refactiring with dependancies