Cleanup of directory structure
Added click event (may refactor afterwards)