Moved sources to src, made some optimizations