restructured project to be more concise