Create a better code base

Removed dependencies + scope the code correctly.