Edited file structure to match lucas spec's