Changed to separated files