Moved source files into common directory