Removed prepocessor directives, source tree slightly reorganized.