Architecture improvements
Added default task to rake