Created a more node module like structure