Moved directive and service scripts into subfolders;