Refactoring modules & dependancies