Fixed directory constants and moved files properly