Moved common files to subspec