Moved classes into Ethanol folder
File cleanup