Added some minor todos, changed the name of the src folder