Moved sources to src directory, and added a few things