Cosmetic changes

Cleaned up redundant whitespaces, converted tabs to spaces wherever possible and moved up files in the directory hierarchy.