Renamed source folders, Activity & layout etc