Improved Readers
Restructure project layout