un-consolidating public/ and source/ dirs