Fixed and separated files, All compiles now.