folder structure optimization and adds account form logic