added index, renamed classes to modules