Commit #4

Made some re-arrangements.