Splitting common and app files