Move startup file to correct folder
Fix wrapping issues