Added modules folder
Refractored