Changed directory structure, updated constants