COMPLETELY overhauled structure, moved things around, updated bash prompt