cleaned up the file names.
some minor changes to try to find the error in the code. Why constants.h is double defined although and include gaurd is in place.