rearanged some files

Signed-off-by: Gregory Klupar <Klupamos@gmail.com>