Moved files into "common" folder