Fixed naming and directory issues