Started to format directory structure