Updated basic project organization