Crafting Work aswell as cleanup

Worked on some more crafting things with circles something that should
be very interesting aswell as moving some packages around and making
things a bit neater... also did more work on the energy and decay, thats
still WIP though