Rearranged content for better preview
Added TODO file