code improvements; folder structure improvements