Added some style changes and directory organization.