small code changes and renamed files