Re-arranged files, added comments.