Re-arrange header files to simplify, update views and sign-up flow, add hidden field for current_org