Updated and moved the structure a bit to make it a lot cleaner
Updated the README