Visual changes

Plus file org. changes