Project folder re-organzied. Project compilation improved.