Updates for readablity & added needed folder