some cleanup and moving of files
Homogeneous whitespaces: trimmed TABs and removed some useless whitespaces