removed unused location again
comments / formatting
cleaned up folder structure