re-arrange files, remove old states
minor tweaks