Cleaned up

Added last minute changes, renamed source for specification