Organize everything, add executable