clean up hierachy
move resource file to correspond directories