Working on dependencies
More setup and structuring