Problem creating a library

I have some code that uses the adafruit adc. There is a test file, an adsfruit_ADS1015.h and adafruit_ADS1015.cpp file. The code compiles perfectly.

I then take the ads1015.h and .cpp files and put them in a subdirectory called adafruit_ADS1x15 and place this subdirectory into my \libraries subdirectory. Now when I compile I get a list of errors all stating that I have multiple definitions of routines. The error code is referencing the files within my \libraries subdirectory. Any suggestions as to what I am doing wrong?

I tried changing my #include statement from #include "adafruit_ADS1015.h" to #include <adafruit_ADS1015.h> but this does not help.

Now when I compile I get a list of errors all stating that I have multiple definitions of routines.

Compiler telling you that you had included header file more than one time.
include library file only once.

You have the standard #ifndef in your header file?