Nico apo scott features

Added features, moved files to right folder, changed database names in database yml.