Hopefully restructured the src folder better