Reorganizing folder structure & adding navbar button