restructure of files
Modal login added