adding common files
removed standalone aspects that are in the standalone branch