Directory layout ordering and minor changes
minor fix in sourcing multiple files