moved foldes to seperate path for user, admin and both (general); added subnav