moved common file into sub directories