Moved file to new name and made some fixes