Renamed files/folders for more relevance. Other small code changes.