Fixed some inconsistencies in organization