reorganising directories and making the code a little more presentable