Tons of file structure updates and contact page + form updates