organized folder structure, fixed identing and fixed global scope pollution