Re-design

Initial Commit