Removed Useless Files and Finalized Energy System