More things to commit!
Revert "Reorganized some folders and brand new energy mechanics!"

This reverts commit 9e2f718ebdf8aac57320a0b32f9804d13de58d0d.
Revert "Revert "Reorganized some folders and brand new energy mechanics!""

This reverts commit 0dba55686a53c20abf3a7271496883263704ddc4.