Fixed minor things and added skeleton files