directories reorganized, prepairing for build target