reorganized layout for compilation purposes, also converted everything to LF