Reorganize directories to match Maven standards