cleaned up a little code
restructred directories