Restructured directories to follow best practices