renamed files, rearanged methods
received data saved into database