changed database structure, moved all layout variables to values folder