new structure

login and index changes