Added message class and renamed files