Fixed lint errors; corrected directory layout