Improved main component and file order. Updated component author comments